From 71f6f7a34a25509eebf6b8d64d12e49d2c2de773 Mon Sep 17 00:00:00 2001
From: robertl <robertl>
Date: Sat, 1 Jul 2006 23:57:11 +0000
Subject: [PATCH] This is gross.  Olaf's change to the link line (which is
 actually correct) broke the OS/X build becuase of link order.

Will someone please tell me again how great autoconf is?

CTVS: ----------------------------------------------------------------------
---
 configure    | 8 ++++++++
 configure.in | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/configure b/configure
index a544924b8..5fa1ca7c5 100755
--- a/configure
+++ b/configure
@@ -2774,6 +2774,8 @@ fi
 		*-*-darwin*)
 		  if test "x$ac_cv_lib_usb_usb_interrupt_read" = "xyes" ; then
 			USB_LIBS="`libusb-config --prefix`/lib/libusb.a -framework  IOKit -framework CoreFoundation"
+			LDFLAGS=$OLDFLAGS
+			CDFLAGS=$OCDFLAGS
 		  fi
 		esac
 		OSJEEPS=jeeps/gpslibusb.o
@@ -2831,6 +2833,12 @@ else
 	*-*-darwin*)
 		if test -f /sw/lib/libexpat.a ; then
 			EXPAT_LIB=/sw/lib/libexpat.a
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_LIBEXPAT 1
+_ACEOF
+
+
 		fi
 		;;
 	*)
diff --git a/configure.in b/configure.in
index a92b2e52a..594a80593 100644
--- a/configure.in
+++ b/configure.in
@@ -116,6 +116,8 @@ case "$target" in
 		*-*-darwin*)
 		  if test "x$ac_cv_lib_usb_usb_interrupt_read" = "xyes" ; then
 			USB_LIBS="`libusb-config --prefix`/lib/libusb.a -framework  IOKit -framework CoreFoundation"
+			LDFLAGS=$OLDFLAGS
+			CDFLAGS=$OCDFLAGS
 		  fi
 		esac
 		OSJEEPS=jeeps/gpslibusb.o
@@ -161,6 +163,8 @@ AC_ARG_WITH(libexpat,
 	*-*-darwin*)
 		if test -f /sw/lib/libexpat.a ; then
 			EXPAT_LIB=/sw/lib/libexpat.a
+			  AC_DEFINE(HAVE_LIBEXPAT, 1, [Defined if you have libexpat])
+			  AC_SUBST(EXPAT_LIB)
 		fi
 		;;
 	*)
-- 
2.30.2